New API to set the shadow type of the arrow panel.

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 6692cb1f6bab85613d3486654cf4e3ad24cc155c..b2eea8384436ef1af88e915271af9a1bfa25a47b 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -152,6 +152,7 @@ gtk_spin_button_init (GtkSpinButton *spin_button)
 {
   spin_button->adjustment = NULL;
   spin_button->panel = NULL;
+  spin_button->shadow_type = GTK_SHADOW_OUT;
   spin_button->timer = 0;
   spin_button->climb_rate = 0.0;
   spin_button->timer_step = 0.0;
@@ -364,11 +365,12 @@ gtk_spin_button_paint (GtkWidget    *widget,
 
   if (GTK_WIDGET_DRAWABLE (widget))
     {
-      gtk_draw_shadow (widget->style, spin->panel,
-                      GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                      0, 0, ARROW_SIZE + 2 * widget->style->klass->xthickness,
-                      widget->requisition.height); 
-
+      if (spin->shadow_type != GTK_SHADOW_NONE)
+       gtk_draw_shadow (widget->style, spin->panel,
+                        GTK_STATE_NORMAL, spin->shadow_type,
+                        0, 0, 
+                        ARROW_SIZE + 2 * widget->style->klass->xthickness,
+                        widget->requisition.height); 
       gtk_spin_button_draw_arrow (spin, GTK_ARROW_UP);
       gtk_spin_button_draw_arrow (spin, GTK_ARROW_DOWN);
 
@@ -1124,10 +1126,25 @@ gtk_spin_button_insert_text (GtkEditable *editable,
 
 void
 gtk_spin_button_set_wrap (GtkSpinButton  *spin_button,
-                         gint            wrap)
+                         gint            wrap)
 {
   g_return_if_fail (spin_button != NULL);
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
   spin_button->wrap = (wrap != 0);
 }
+
+void
+gtk_spin_button_set_shadow_type (GtkSpinButton *spin_button,
+                                GtkShadowType  shadow_type)
+{
+  g_return_if_fail (spin_button != NULL);
+  g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
+
+  if (shadow_type != spin_button->shadow_type)
+    {
+      spin_button->shadow_type = shadow_type;
+      if (GTK_WIDGET_DRAWABLE (spin_button))
+       gdk_window_clear (spin_button->panel);
+    }
+}

diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index e7a70fd611fb918120d868f5494a3083b81f5cf1..8d1641882b63875a516bef49bb311bd0c1e57daf 100644 (file)
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -58,7 +58,8 @@ struct _GtkSpinButton
   GtkAdjustment *adjustment;
   
   GdkWindow *panel;
-  
+  GtkShadowType shadow_type;
+
   guint32 timer;
   
   gfloat climb_rate;
@@ -120,6 +121,9 @@ void                gtk_spin_button_spin               (GtkSpinButton *spin_button,
 void           gtk_spin_button_set_wrap           (GtkSpinButton  *spin_button,
                                                    gint            wrap);
 
+void           gtk_spin_button_set_shadow_type    (GtkSpinButton  *spin_button,
+                                                   GtkShadowType   shadow_type);
+
 
 
 

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index b93a16da61b46b3c5e4d5a793de49a434be97ea7..ed1d72244f8a224622d1ff8b3cee284a27fb658c 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -2472,6 +2472,8 @@ create_spins (void)
                                                  5.0, 0.0);
       spinner = gtk_spin_button_new (adj, 0, 0);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+      gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+                                      GTK_SHADOW_NONE);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
 
       vbox2 = gtk_vbox_new (FALSE, 0);
@@ -2485,6 +2487,8 @@ create_spins (void)
                                                  5.0, 0.0);
       spinner = gtk_spin_button_new (adj, 0, 0);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+      gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+                                      GTK_SHADOW_ETCHED_IN);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
       
       vbox2 = gtk_vbox_new (FALSE, 0);
@@ -2498,6 +2502,8 @@ create_spins (void)
                                                  1.0, 100.0, 0.0);
       spinner = gtk_spin_button_new (adj, 0, 0);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+      gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+                                      GTK_SHADOW_IN);
       gtk_widget_set_usize (spinner, 55, 0);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
 

diff --git a/tests/testgtk.c b/tests/testgtk.c
index b93a16da61b46b3c5e4d5a793de49a434be97ea7..ed1d72244f8a224622d1ff8b3cee284a27fb658c 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2472,6 +2472,8 @@ create_spins (void)
                                                  5.0, 0.0);
       spinner = gtk_spin_button_new (adj, 0, 0);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+      gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+                                      GTK_SHADOW_NONE);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
 
       vbox2 = gtk_vbox_new (FALSE, 0);
@@ -2485,6 +2487,8 @@ create_spins (void)
                                                  5.0, 0.0);
       spinner = gtk_spin_button_new (adj, 0, 0);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+      gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+                                      GTK_SHADOW_ETCHED_IN);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
       
       vbox2 = gtk_vbox_new (FALSE, 0);
@@ -2498,6 +2502,8 @@ create_spins (void)
                                                  1.0, 100.0, 0.0);
       spinner = gtk_spin_button_new (adj, 0, 0);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
+      gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
+                                      GTK_SHADOW_IN);
       gtk_widget_set_usize (spinner, 55, 0);
       gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);